*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b43107bc61b4f628ff59565f2d73ff213899b478..04bf6a69055c4b29207d26b4657c75122e9236fb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-09  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+       * progmodes/cc-style.el (c-set-style, c-set-style-1): Added
+       another state for the `dont-override' flag where it only keeps
+       globally set variables.
+
 2002-06-08  Colin Walters  <walters@gnu.org>
 
        * descr-text.el (describe-text-properties): Sort the output by the